Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 22 Jun 2010 21:53:33 +0000 (23:53 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 22 Jun 2010 21:53:33 +0000 (23:53 +0200)
commit37a299e39cf44ba6aa5d3f5e2b69bdda52e30335
tree8133a4f4adcb5dff33acfc21e6567943d2cad1c0
parentf44c2723af2213982d506add36867d12764f7166
parent34a4526e219b6aac90da6d86cca2fc30a86df90c
Merge branch 'upstream'